Fix rebase conflict detection in git 2.26 #10929
+23
−6
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.